Sync upstream v11.2.0 (merge conflicts)#75

Closed

JOY (JOY) wants to merge 93 commits into

mainfrom

sync-upstream-v11.2.0

JOY (JOY) commented Jun 17, 2026

Upstream Sync - v11.2.0

Auto-merge with upstream v11.2.0 failed. Version/workflow conflicts were auto-resolved,
but the following files have code conflicts that need manual resolution:

docker-compose/envs/common-blockscout.env

To resolve:

Check out this branch locally
Resolve remaining conflicts
Push and merge this PR
Then create tag v11.2.0 to trigger Docker build

Upstream release notes

Alexander Kolotov (akolotov) and others added 30 commits

May 8, 2026 18:45


          chore: OpenAPI spec for Arbitrum-related endpoints (blockscout#14169)

325c059

Co-authored-by: Alexander Kolotov <alexander.kolotov@gmail.com>
Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>


          chore: OpenAPI specifications for all /api/v2/advanced-filters endp…

05381be

…oints (blockscout#14227)

Co-authored-by: Alexander Kolotov <alexander.kolotov@gmail.com>
Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>


          doc: add verification websocket subscription guide (blockscout#14259)

da94a97


          fix: improvements of OpenAPI specification for /v2/blocks (blocksco…

e4a8500

…ut#14251)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Alexander Kolotov <alexander.kolotov@gmail.com>
Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nikita Pozdniakov <nikitosing4@mail.ru>
Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Co-authored-by: Qwerty5Uiop <alex000010@bk.ru>
Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>


          chore(deps): bump decimal from 2.3.0 to 2.4.1 (blockscout#14357)

9f26983

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump cldr_utils from 2.29.5 to 2.29.7 (blockscout#14355)

e6eddc1

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump phoenix_live_view from 1.1.28 to 1.1.30 (blockscout…

efbea35

…#14350)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump absinthe_phoenix from 2.0.4 to 2.0.5 (blockscout#14345

768bf56

)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps-dev): bump ex_doc from 0.40.1 to 0.40.2 (blockscout#14341)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump open_api_spex from 3.22.2 to 3.22.3 (blockscout#14353)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump ex_cldr_units from 3.20.3 to 3.20.4 (blockscout#14340)

81b3d9d

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump ex_json_schema from 0.11.2 to 0.11.3 (blockscout#14356

b59af08

)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump postgrex from 0.22.0 to 0.22.1 (blockscout#14354)

1b51b4d

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore: Eliminate horizontal scroll in the main LICENSE file (blocksco…

8c56356

…ut#14359)


          chore: Add SPDX attribution (blockscout#14360)

34f4dcf


          chore(deps): bump mint from 1.7.1 to 1.8.0 (blockscout#14351)

d9edfc3

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump postgrex from 0.22.1 to 0.22.2 (blockscout#14376)

a695ecc

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps-dev): bump cowboy from 2.14.2 to 2.15.0 (blockscout#14377)

bc75c8e

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump floki from 0.38.1 to 0.38.2 (blockscout#14378)

7c162ce

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump tesla from 1.17.0 to 1.18.2 (blockscout#14375)

4673c5f

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore: Partial async import (blockscout#14277)

2a7db0b

Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>


          11.1.0

b0017f0


          fix: Return repo replica to indexer (blockscout#14383)

d38b2ef


          chore: Close linked issues when PRs merge into dev (blockscout#14384)

2a3dc18

Co-authored-by: Cursor <cursoragent@cursor.com>


          fix: Parse GitHub issue URLs in dev-merge close workflow (blockscout#…

b53c1ac

…14385)

Co-authored-by: Cursor <cursoragent@cursor.com>


          Update CHANGELOG


          feat: Forward new BENS fields to search (blockscout#14389)

c77f6fe


          Update CHANGELOG

69c3102


          chore: Add MIGRATION_FILL_INTERNAL_TRANSACTIONS_ADDRESS_IDS_CONCURREN…

6075b61

…CY (blockscout#14390)

Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>


          chore: publish OpenAPI specs on dev branch pushes (blockscout#14391)

ec21659

Co-authored-by: Cursor <cursoragent@cursor.com>

Qwerty5Uiop and others added 19 commits

June 13, 2026 22:02


          fix: Improve BlockNumber cache (blockscout#14453)

3695db3


          Update CHANGELOG

9b1591a


          chore(deps): bump absinthe from 1.10.2 to 1.11.0 (blockscout#14467)

1a9d89e

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump tesla from 1.18.2 to 1.20.0 (blockscout#14465)

fc7e637

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump oauth2 from 2.1.0 to 2.1.1 (blockscout#14474)

ebbeb0b

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump ex_cldr_numbers from 2.38.2 to 2.38.3 (blockscout#1…

ffa5e6b

…4473)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps-dev): bump credo from 1.7.18 to 1.7.19 (blockscout#14471)

fd3c62f

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump varint from 1.5.1 to 1.6.0 (blockscout#14470)

417a2cb

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps-dev): bump benchee from 1.5.0 to 1.5.1 (blockscout#14469)

59ee56e

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore: Move ctb deriving before addresses lock (blockscout#14479)

b9f3964


          Update CHANGELOG

6e5a3a1


          chore(deps): bump que from 0.10.1 to 0.12.0 (blockscout#14466)

d880751

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps-dev): bump cowboy from 2.15.0 to 2.16.1 (blockscout#14462)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore: add @blockscout/api-types npm package and publish workflows (b…

4f658b3

…lockscout#14433)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>


          chore(deps): bump mint from 1.8.0 to 1.9.0 (blockscout#14468)

4b38e3c

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore(deps): bump evision from 0.2.16 to 0.2.17 (blockscout#14461)

5bc5854

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          Temp disable types npm package publishing

b05cba6


          fix: Don't start health monitor in tests (blockscout#14481)

7d0dd48


          Update CHANGELOG

3825cf4

gemini-code-assist Bot commented Jun 17, 2026

Warning

Gemini encountered an error creating the review. You can try again by commenting /gemini review.

chatgpt-codex-connector Bot commented Jun 17, 2026

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

github-advanced-security AI found potential problems

View reviewed changes

.github/workflows/publish-api-types-npm-dev.yml

Comment on lines +9 to +18

+                  name: Resolve dev package version
+                  runs-on: ubuntu-latest
+                  outputs:
+                    package_version: ${{ steps.set.outputs.package_version }}
+                  steps:
+                    - name: Set version from commit SHA
+                      id: set
+                      run: echo "package_version=v0.0.1-beta.${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
+                publish:

.github/workflows/publish-api-types-npm-dev.yml

Comment on lines +19 to +25

+                  name: Build and publish
+                  needs: version
+                  uses: ./.github/workflows/publish-api-types-npm.yml
+                  with:
+                    package_version: ${{ needs.version.outputs.package_version }}
+                  secrets:
+                    NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

JOY (JOY) force-pushed the sync-upstream-v11.2.0 branch 3 times, most recently from f1135af to 4a716df Compare

June 18, 2026 06:43


          WIP: Merge upstream v11.2.0 (has conflicts)

1fb440f

JOY (JOY) force-pushed the sync-upstream-v11.2.0 branch from 4a716df to 1fb440f Compare

June 18, 2026 11:44

JOY (JOY) commented Jul 19, 2026

Author

Superseded: main is on v11.2.2 (PR #77 merged 2026-07-14), which includes this upstream version.

JOY (JOY) closed this

JOY (JOY) deleted the sync-upstream-v11.2.0 branch

July 19, 2026 03:03

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet